From d075c7deb744ba71cd355c7a85b87826a1cee03b Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 25 Mar 2013 02:11:58 +0000
Subject: [PATCH] Kick out almost all of the NEWTIME props.

---
 gpsbabel/cetus.cc | 19 -------------------
 gpsbabel/defs.h   | 11 -----------
 gpsbabel/gopal.cc |  4 ----
 gpsbabel/holux.cc |  9 ---------
 gpsbabel/kml.cc   |  5 -----
 gpsbabel/waypt.cc |  8 +-------
 6 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/gpsbabel/cetus.cc b/gpsbabel/cetus.cc
index 8f29e2fbf..f8d8e6394 100644
--- a/gpsbabel/cetus.cc
+++ b/gpsbabel/cetus.cc
@@ -455,7 +455,6 @@ cetus_writewpt(const waypoint* wpt)
 
   rec = (struct cetus_wpt_s*) xcalloc(sizeof(*rec)+18 + NOTESZ + DESCSZ,1);
 
-#if NEWTIME
   QDate date(wpt->creation_time.date());
   rec->day = date.day();
   rec->mon = date.month();
@@ -466,24 +465,6 @@ cetus_writewpt(const waypoint* wpt)
   rec->hour = time.hour();
   rec->sec = time.second();
 
-#else
-  struct tm* tm;
-  if (wpt->creation_time && (NULL != (tm = gmtime(&wpt->creation_time)))) {
-    rec->min = tm->tm_min;
-    rec->hour = tm->tm_hour;
-    rec->sec = tm->tm_sec;
-    rec->day = tm->tm_mday;
-    rec->mon = tm->tm_mon + 1;
-    be_write16(&rec->year, tm->tm_year + 1900);
-  } else {
-    rec->min = 0xff;
-    rec->hour = 0xff;
-    rec->sec = 0xff;
-    rec->day = 0xff;
-    rec->mon = 0xff;
-    be_write16(&rec->year, 0xff);
-  }
-#endif
   be_write32(&rec->longitude, (unsigned int)(int)(wpt->longitude * 10000000.0));
   be_write32(&rec->latitude, (unsigned int)(wpt->latitude * 10000000.0));
   if (wpt->altitude == unknown_alt) {
diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 414e32882..0d49c9dfd 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -41,9 +41,7 @@
 #include "inifile.h"
 #include "session.h"
 
-#if NEWTIME
 # include "src/core/datetime.h"
-#endif
 
 // Turn on Unicode in expat?
 #ifdef _UNICODE
@@ -459,11 +457,6 @@ public:
   description(NULL), 
   notes(NULL), 
   url_next(NULL), 
-#if NEWTIME
-//  creation_time(QDateTime::fromTime_t(0)),
-#else
-  creation_time(0), 
-#endif
   microseconds(0), 
   route_priority(0), 
   hdop(0), 
@@ -540,11 +533,7 @@ public:
 
   wp_flags wpt_flags;
   QString icon_descr;
-#if NEWTIME
   gpsbabel::DateTime creation_time;
-#else
-  time_t creation_time;	/* standardized in UTC/GMT */
-#endif
   int microseconds;	/* Optional millionths of a second. */
 
   /*
diff --git a/gpsbabel/gopal.cc b/gpsbabel/gopal.cc
index 97aa7e0c5..59e9cdfb1 100644
--- a/gpsbabel/gopal.cc
+++ b/gpsbabel/gopal.cc
@@ -351,11 +351,7 @@ gopal_write_waypt(const waypoint* wpt)
   int fix=fix_unknown;
   //TICK;    TIME;   LONG;     LAT;       HEIGHT; SPEED;  UN; HDOP;     SAT
   //3801444, 080558, 2.944362, 43.262117, 295.28, 0.12964, 2, 2.900000, 3
-#if NEWTIME
   snprintf(tbuffer, sizeof(tbuffer), "%06d", wpt->creation_time.hms());
-#else
-  strftime(tbuffer, sizeof(tbuffer), "%H%M%S", gmtime(&wpt->creation_time));
-#endif
   if (wpt->fix!=fix_unknown) {
     switch (wpt->fix) {
     case fix_none:
diff --git a/gpsbabel/holux.cc b/gpsbabel/holux.cc
index fd1fc2381..3def99f58 100644
--- a/gpsbabel/holux.cc
+++ b/gpsbabel/holux.cc
@@ -227,21 +227,12 @@ static void holux_disp(const waypoint* wpt)
   /*set the time */
   if (wpt->creation_time) {
     /* tm = gmtime(&wpt->creation_time);*/  /* I get the wrong result with gmtime ???  */
-#if NEWTIME
     QDate date(wpt->creation_time.date());
     QTime time(wpt->creation_time.time());
     pWptHxTmp->time = (time.hour() * 3600) + (time.minute()* 60) + time.second();
     pWptHxTmp->date.day = date.day();
     pWptHxTmp->date.month = date.month();
     pWptHxTmp->date.year = date.year();
-#else
-    struct tm* tm;
-    tm = localtime(&wpt->creation_time);
-    pWptHxTmp->time = (tm->tm_hour * 3600) + (tm->tm_min * 60) +tm->tm_sec;
-    pWptHxTmp->date.day = tm->tm_mday;
-    pWptHxTmp->date.month = tm->tm_mon + 1;
-    pWptHxTmp->date.year = tm->tm_year + 1900;
-#endif
   } else {
     pWptHxTmp->time = 0;
     pWptHxTmp->date.day = 0;
diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc
index 5e58ac2c2..be6b21de7 100644
--- a/gpsbabel/kml.cc
+++ b/gpsbabel/kml.cc
@@ -1451,13 +1451,8 @@ static void kml_geocache_pr(const waypoint* waypointp)
   // Timestamp
   kml_output_timestamp(waypointp);
   if (waypointp->creation_time) {
-#if NEWTIME
     strcpy(date_placed,
            qPrintable(waypointp->creation_time.toString("dd-MMM-yyyy")));
-#else
-    strftime(date_placed, sizeof(date_placed),
-             "%d-%b-%Y", localtime(&waypointp->creation_time));
-#endif
   } else {
     date_placed[0] = '\0';
   }
diff --git a/gpsbabel/waypt.cc b/gpsbabel/waypt.cc
index 3cf5661c6..f7f4228ee 100644
--- a/gpsbabel/waypt.cc
+++ b/gpsbabel/waypt.cc
@@ -231,15 +231,9 @@ set_waypt_count(unsigned int nc)
 void
 waypt_disp(const waypoint *wpt)
 {
-#if NEWTIME
   if (wpt->creation_time.isValid()) {
-  printf("%s", qPrintable(wpt->creation_time.toString()));
+    printf("%s ", qPrintable(wpt->creation_time.toString()));
   }
-#else
-  if (wpt->creation_time) {
-    printf("%s ", ctime(&wpt->creation_time));
-  }
-#endif
   printposn(wpt->latitude,1);
   printposn(wpt->longitude,0);
 
-- 
2.30.2